XEN_GUEST_HANDLE_00030205() compat macro is broken. Remove it and

open-code an alternative at its two invocation sites.

Based on a patch by Jan Beulich.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h
index c5d1ebd5190e45c95d9de2817ce46b6e647e9d4b..75990545b2dd467b32195ebb8f79d5cd13a1ace0 100644 (file)
--- a/xen/include/public/physdev.h
+++ b/xen/include/public/physdev.h
@@ -81,7 +81,11 @@ DEFINE_XEN_GUEST_HANDLE(physdev_set_iopl_t);
 #define PHYSDEVOP_set_iobitmap           7
 struct physdev_set_iobitmap {
     /* IN */
-    XEN_GUEST_HANDLE_00030205(uint8) bitmap;
+#if __XEN_INTERFACE_VERSION__ >= 0x00030205
+    XEN_GUEST_HANDLE(uint8) bitmap;
+#else
+    uint8_t *bitmap;
+#endif
     uint32_t nr_ports;
 };
 typedef struct physdev_set_iobitmap physdev_set_iobitmap_t;

diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h
index f0e70dddbeff8fdc1d9bbd6376e017d7f34696ff..c9f369f0e948089ceafc56a4aeae08867543aadc 100644 (file)
--- a/xen/include/public/xen-compat.h
+++ b/xen/include/public/xen-compat.h
@@ -41,11 +41,4 @@
 #error "These header files do not support the requested interface version."
 #endif
 
-/* Fields defined as a Xen guest handle since 0x00030205. */
-#if __XEN_INTERFACE_VERSION__ >= 0x00030205
-#define XEN_GUEST_HANDLE_00030205(type) XEN_GUEST_HANDLE(type)
-#else
-#define XEN_GUEST_HANDLE_00030205(type) type *
-#endif
-
 #endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */

diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
index a3b1d2fc3f65a2415b2a2ddc777f21c155861ef4..cce608606291ec7c942b8ce10687e220d61575cc 100644 (file)
--- a/xen/include/public/xen.h
+++ b/xen/include/public/xen.h
@@ -263,7 +263,11 @@ struct mmuext_op {
         /* SET_LDT */
         unsigned int nr_ents;
         /* TLB_FLUSH_MULTI, INVLPG_MULTI */
-        XEN_GUEST_HANDLE_00030205(void) vcpumask;
+#if __XEN_INTERFACE_VERSION__ >= 0x00030205
+        XEN_GUEST_HANDLE(void) vcpumask;
+#else
+        void *vcpumask;
+#endif
     } arg2;
 };
 typedef struct mmuext_op mmuext_op_t;